Merge git://git.denx.de/u-boot-dm
authorTom Rini <[email protected]>
Fri, 5 Jun 2015 15:21:08 +0000 (11:21 -0400)
committerTom Rini <[email protected]>
Fri, 5 Jun 2015 15:21:08 +0000 (11:21 -0400)

Trivial merge